Correct return_if_fail checks. (#379803, Tommi Komulainen)

        * gdk/x1/gdkinput-xfree.c (_gdk_input_configure_event):
        (_gdk_input_enter_event): Correct return_if_fail checks.
        (#379803, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index c828d6363a7cf176f64cd545089f92e29582af30..8d608a08f75b5abeaa880f10b560ca39609a1737 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x1/gdkinput-xfree.c (_gdk_input_configure_event):
+       (_gdk_input_enter_event): Correct return_if_fail checks.
+       (#379803, Tommi Komulainen)
+
        * gdk/gdkdisplay.c: Improve the docs of some functions operating
        on the default display.  (##353438, Mariano Suárez-Alvarez)
 

diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c
index fcebbca69ee4c84b13fc50f84c7ac21a32e0b424..d3a7ea74fa2efc1ecf591b1870b45c5a7559aa2f 100644 (file)
--- a/gdk/x11/gdkinput-xfree.c
+++ b/gdk/x11/gdkinput-xfree.c
@@ -150,7 +150,7 @@ _gdk_input_configure_event (XConfigureEvent *xevent,
   gint root_x, root_y;
 
   input_window = _gdk_input_window_find(window);
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (input_window != NULL);
 
   _gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
                                        GDK_WINDOW_XWINDOW (window),
@@ -168,7 +168,7 @@ _gdk_input_enter_event (XCrossingEvent *xevent,
   gint root_x, root_y;
 
   input_window = _gdk_input_window_find (window);
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (input_window != NULL);
 
   gdk_input_check_proximity(GDK_WINDOW_DISPLAY (window));
 
@@ -192,7 +192,7 @@ _gdk_input_other_event (GdkEvent *event,
   GdkDisplayX11 *display_impl = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
 
   input_window = _gdk_input_window_find(window);
-  g_return_val_if_fail (window != NULL, FALSE);
+  g_return_val_if_fail (input_window != NULL, FALSE);
 
   /* This is a sort of a hack, as there isn't any XDeviceAnyEvent -
      but it's potentially faster than scanning through the types of